Merge from master
Merge branch 'master' into responsive

Conflicts:
	addThing.php
Merge branch 'responsive'