removed tray as a form and added bootstrap modal function for 'new assets' button
Merge branch 'master' of github.com:RAllner/fassets_core

Conflicts:
	app/assets/javascripts/fassets_core/add_asset_box.js
	app/controllers/assets_controller.rb
	app/views/assets/new.js.erb
	app/views/shared/_tray.html.haml