init commit
Merge branch 'develop' into template
Merge branch 'develop' into templates

Conflicts:
	app/views/wireframes/index.html
chris' changes
Merge branch 'develop' into templates
fixing javascript links
Merge branch 'develop' into templates