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
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
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
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
Merge branch 'dev/raymoond_dev' of github.com:Coursemology/coursemology.org into dev/raymoond_deploy
increased CPU resource for code executing
Merge branch 'development' of github.com:Coursemology/coursemology.org into dev/raymoond_deploy

Conflicts:
	app/helpers/training_submissions_helper.rb
precompiled assets
Merge branch 'development' of github.com:Coursemology/coursemology.org into dev/raymoond_deploy
precompiled assets
clean assets in dev