home
Merge remote-tracking branch 'origin/master'

Conflicts:
	log/development.log
	tmp/cache/assets/development/sprockets/8ab512c9b33ac90e699b73469d71f061
	tmp/cache/assets/development/sprockets/bcca522c6302f184f12fe0e8a7d7e71a
	tmp/cache/assets/development/sprockets/c13fc73ceafa45876a901b3e775b83ae
	tmp/pids/server.pid