pre-merge to master;
Refactored all api calls. All posts now require a user_id field and the auth token. Code has been cleaned up. Readme has been updated.
Refactored all API calls. Please see ReadMe for update
removed tmp folder Merge branch 'dev' of https://github.com/damouse/Glassroom-Server into ajax

Conflicts:
	db/development.sqlite3
	log/development.log
	tmp/cache/assets/development/sprockets/00149270baa6c3e25384cef2b80af68c
	tmp/cache/assets/development/sprockets/06b4f8cf403d69231a5d37ace0ba26aa
	tmp/cache/assets/development/sprockets/11147e14a838b1cc0133ca0cb6bc84cc
	tmp/cache/assets/development/sprockets/13fe41fee1fe35b49d145bcc06610705
	tmp/cache/assets/development/sprockets/1cc4ac9030b86b4fff6c31ad40d6c3b0
	tmp/cache/assets/development/sprockets/22a3157d204c1f8e417a25f01a2dbe45
	tmp/cache/assets/development/sprockets/2f5173deea6c795b8fdde723bb4b63af
	tmp/cache/assets/development/sprockets/3330883f382539951352123567618a15
	tmp/cache/assets/development/sprockets/357970feca3ac29060c1e3861e2c0953
	tmp/cache/assets/development/sprockets/4e08fed06f60ae9e332d6f169441ce34
	tmp/cache/assets/development/sprockets/4e2cb52e7723ee768fa48239db95e65e
	tmp/cache/assets/development/sprockets/510f952ec65364713a9077c5390c70d5
	tmp/cache/assets/development/sprockets/5a12ac6519bf003b4a9e9f2489190834
	tmp/cache/assets/development/sprockets/60e9c67c3d322784ca9ea87c7e11962b
	tmp/cache/assets/development/sprockets/6248a5780ba8cd29aacf51fd7c0a82de
	tmp/cache/assets/development/sprockets/6601cdba44b5861ebac6e6c2ea29a253
	tmp/cache/assets/development/sprockets/6654975eaa53a225d976278fcb6baa00
	tmp/cache/assets/development/sprockets/69af72d5131e4aaeae3b4c9a9154a11b
	tmp/cache/assets/development/sprockets/7cf200c925cfe75d60cb8f04280ac52c
	tmp/cache/assets/development/sprockets/840a7823f7b0d11ed52cd93290bf8b8d
	tmp/cache/assets/development/sprockets/bf97a05f665dc25d120e2b4c1d35f481
	tmp/cache/assets/development/sprockets/c29591b65ca4c6d4ad874ead028f7a74
	tmp/cache/assets/development/sprockets/cffd775d018f68ce5dba1ee0d951a994
	tmp/cache/assets/development/sprockets/d352b4dd8ad16c36f5c0d376766744d4
	tmp/cache/assets/development/sprockets/d3ed012d40c2bf060ae6e2625832e664
	tmp/cache/assets/development/sprockets/d40cbf6a8d3ddd1475bcc85d82249862
	tmp/cache/assets/development/sprockets/d771ace226fc8215a3572e0aa35bb0d6
	tmp/cache/assets/development/sprockets/ef34074b876e29fa53d3037565ec546f
	tmp/cache/assets/development/sprockets/f7cbd26ba1d28d48de824f0e94586655
	tmp/cache/assets/development/sprockets/ff480ec469b7396af7830bd33411b95e
	tmp/pids/server.pid