precompiled assets
Merge branch 'dev/raymoond_deploy' of github.com:Coursemology/coursemology.org into dev/raymoond_deploy
precompiled assets
Merge branch 'dev/raymoond_dev' of github.com:Coursemology/coursemology.org into dev/raymoond_deploy

Conflicts:
	public/assets/application-1dd86d40973a45edcdaf2c351a70faf1.css.gz
	public/assets/application-4889f0a2bcb8219f11170bedcf761b6b.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
Merge branch 'development' of github.com:Coursemology/coursemology.org into dev/raymoond_deploy
precompiled assets
Merge branch 'development' of github.com:Coursemology/coursemology.org into dev/raymoond_deploy
precompiled assets
precompiled assets
Merge branch 'dev/raymoond_dev' of github.com:Coursemology/coursemology.org into dev/raymoond_deploy
precompiled assets
precompiled assets
Merge branch 'dev/raymoond_dev' of github.com:Coursemology/coursemology.org into dev/raymoond_deploy
Merge branch 'dev/raymoond_dev' of github.com:Coursemology/coursemology.org into dev/raymoond_deploy
Allow entries to be created and end in the past.
Merge branch 'lessonbin' of github.com:fuzzie360/coursemology.org into lessonbin
undo previous fix
fix invalid material file
remove compiled assets from dev branch