New mobile web/app layout
Merge branch 'master' of github.com:qark/DevConf

Conflicts:
	website/dashboard/controllers.js
Added missing files