Merge branch 'feature/crshandling' into develop

# Conflicts:
#	example/Images/re_2012-06-12.bsq.aux.xml
#	example/Images/re_2012-07-25.bsq.aux.xml
#	example/Images/re_2012-09-06.bsq.aux.xml
#	example/Images/re_2013-05-18.bsq.aux.xml
#	example/Images/re_2014-06-25.bsq.aux.xml
#	example/Images/re_2014-08-17.bsq.aux.xml
#	example/Images/re_2014-08-20.bsq.aux.xml
#	example/Images/re_2014-08-26.bsq.aux.xml
#	example/Images/re_2015-07-13.bsq.aux.xml
#	example/Images/re_2015-08-10.bsq.aux.xml