modified designer controller and view, added page show to events
modified designer controller and view, added page show to events
Merge remote-tracking branch 'origin/master'

Conflicts:
	db/development.sqlite3
modified designer controller and view, added page show to events