Getting basic app structure in place
Merge remote-tracking branch 'origin/master'

Conflicts:
	pf3_admin/index.html
	pf3_admin/js/app.js
	pf3_admin/js/controller.js