diy+comment 28aug2014
Merge remote-tracking branch 'origin/dev' into dev

Conflicts:
	css/main.css