Added activity pages and js files.
Changes to add new activity type.
Merge remote-tracking branch 'origin/ss-pages'

Conflicts:
	app/index.html
	app/scripts/app.js
	app/views/header.html