Merge branch 'master' into 120

Conflicts:
	sites/all/themes/idevels/styles/styles.css
Merge remote-tracking branch 'origin/156'

Conflicts:
	sites/all/themes/idevels/styles/styles.css
Merge remote-tracking branch 'origin/120'
Merge remote-tracking branch 'origin/155'
Merge remote-tracking branch 'origin/157'

Conflicts:
	sites/all/themes/idevels/styles/styles.css
Merge remote-tracking branch 'origin/193'

Conflicts:
	sites/all/themes/idevels/scripts/scripts.js
Merge remote-tracking branch 'origin/199'

Conflicts:
	sites/all/themes/idevels/styles/styles.css
	sites/all/themes/idevels/template.php
Merge remote-tracking branch 'origin/200'

Conflicts:
	sites/all/themes/idevels/scripts/scripts.js
	sites/all/themes/idevels/styles/styles.css
Merge remote-tracking branch 'origin/217'
Merge remote-tracking branch 'origin/157'
Merge remote-tracking branch 'origin/200'
Task #157: Move photos up
Merge branch 'master' into 157
Merge branch '157' into test

Conflicts:
	sites/all/themes/idevels/scripts/scripts.js
	sites/all/themes/idevels/styles/styles.css
	sites/all/themes/idevels/template.php