removing old js files
adding in ember gems
bootstrapping the ember app
adding bootstrap for styles
adding basic seeds
Merge branch 'master' into front-end

Conflicts:
	app/assets/javascripts/annotations.js.coffee
merge?
adding in ember gems
bootstrapping the ember app
adding bootstrap for styles
adding basic seeds
Merge branch 'front_end' of github.com:arfon/theoj into front_end

Conflicts:
	app/assets/javascripts/users.js.coffee
Merge branch 'master' into front-end
route to grab the current user
deprecated application store in ember
get the overall permissions a user has on a paper + test for this
moving a few responses over to the responds_to pattern until we can decide on json api or  serializers or whatever
setting up a few basic ember routes
Adding a home page to render out the ember scripts etc
start of some front end models