unknown changes.
unknown changes.
Merge branch 'master' of https://github.com/nawlbergs/seed

Conflicts:
	server/php/functions/common.php
	src/assets/less/ie.less
	src/viewCtrls/ApiWongo.ctrl.coffee
	src/viewCtrls/App.ctrl.js