pre-merge commit
adding files that were left out of committing
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/images/bg/AT_home-bg.png
	app/panels/work-fonograf.html
Team member edits, first pass