commit
Merge branch 'master' of https://github.com/bceskavich/compasapp

Conflicts:
	db/development.sqlite3
	log/development.log
	tmp/cache/assets/C7D/4D0/sprockets%2F49afcc485435b0c1974023fe36417326
	tmp/cache/assets/CD8/370/sprockets%2F357970feca3ac29060c1e3861e2c0953
	tmp/cache/assets/CFA/3F0/sprockets%2Fc9421ff2df3d13a2673bf0a14c081470
	tmp/cache/assets/D32/A10/sprockets%2F13fe41fee1fe35b49d145bcc06610705
	tmp/cache/assets/D4E/1B0/sprockets%2Ff7cbd26ba1d28d48de824f0e94586655
	tmp/cache/assets/D5A/EA0/sprockets%2Fd771ace226fc8215a3572e0aa35bb0d6
	tmp/cache/assets/E04/890/sprockets%2F2f5173deea6c795b8fdde723bb4b63af
	tmp/pids/server.pid