20130940
Merge branch 'develop' of https://github.com/nt46/Imagic into develop

Conflicts:
	app/controllers/team_users_controller.rb
	log/development.log
	tmp/pids/server.pid