preparing assets for deploy
move assets into asset pipeline
Merge branch 'master' of github.com:instructure/lti_skydrive_engine

Conflicts:
	Gemfile
	Gemfile.lock
	public/skydrive/javascripts/application.js
building gem
Merge branch 'master' of github.com:instructure/lti_skydrive_engine