Merge pull request #22 from fuzzie360/master

Fixed typo in facebook.yml.sample
Merge pull request #23 from fuzzie360/master

Skip email confirmation of seed user
added license
Merge branch 'dev/raymoond_dev' of github.com:Coursemology/coursemology.org into dev/raymoond_deploy
updated precompiled assets
Merge branch 'master' of github.com:Coursemology/coursemology.org into development
remove precompiled assets from development
added remove user achievement
indicate announcement creator's name
add user email to enrolment request
put requestor name and email in lecturer request mail
added contact us page
Merge branch 'dev/raymoond_dev' of github.com:Coursemology/coursemology.org into development
Merge branch 'development' of github.com:Coursemology/coursemology.org into dev/raymoond_deploy

Conflicts:
	public/assets/application-1dd86d40973a45edcdaf2c351a70faf1.css.gz
	public/assets/application-e46bfa975e2f4b5947289f8610ad105a.js.gz
	public/assets/application.css.gz
	public/assets/application.js.gz
	public/assets/bootstrap-wysihtml5-757ecf6fbb670d36519a49c514ec3ea5.css.gz
	public/assets/bootstrap-wysihtml5-d8e3837ccf9ce7a0883e9330d7fbc286.js.gz
	public/assets/bootstrap-wysihtml5.css.gz
	public/assets/bootstrap-wysihtml5.js.gz
	public/assets/bootstrap-wysihtml5/wysiwyg-color-302f69eedfbd67c993f8ce2bc64c971c.css.gz
	public/assets/bootstrap-wysihtml5/wysiwyg-color.css.gz
precompiled assets
added feature to allow including of student's answer for previous training question
precompiled assets