Use registrationPages not pages
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master' into design
Make elements editable
Merge branch 'design' into designEdit
Merge remote-tracking branch 'origin/design' into design
Merge branch 'design' into designEdit

Conflicts:
	app/views/blockDirective.html
Fixed block drag/drop issues.