capistrano task for chmod 777 on tmp-uploads
bump version
Merge remote-tracking branch 'origin/master'

Conflicts:
	lib/basics/version.rb
bump version