page saving
Merge branch 'master' of github.com:silago/hairy-octo-dubstep-ked

Conflicts:
	app/scripts/app.js
	app/scripts/controllers/main.js
	app/scripts/directives/adm-add-widget.js