jquery form implementation
Merge branch 'master' of https://github.com/mvandeloo/360life

Conflicts:
	.DS_Store
	app/.DS_Store
	app/assets/.DS_Store
	tmp/cache/assets/development/sprockets/13fe41fee1fe35b49d145bcc06610705
	tmp/cache/assets/development/sprockets/1450c8f5d2b6e201d72fa175586bbd97
	tmp/cache/assets/development/sprockets/2f5173deea6c795b8fdde723bb4b63af
	tmp/cache/assets/development/sprockets/357970feca3ac29060c1e3861e2c0953
	tmp/cache/assets/development/sprockets/91dfb1e3477659b982feeacb705e8073
	tmp/cache/assets/development/sprockets/cffd775d018f68ce5dba1ee0d951a994
	tmp/cache/assets/development/sprockets/d771ace226fc8215a3572e0aa35bb0d6
	tmp/cache/assets/development/sprockets/dea5e7f68ddcb811c2e05acab86b1e7d
	tmp/cache/assets/development/sprockets/f7cbd26ba1d28d48de824f0e94586655
	tmp/pids/server.pid