added some goodies, added new layout
Merge branch 'master' into staging

Conflicts:
	Gemfile
	Gemfile.lock
Fixed raptor,removed inorganic stuff added test root for dropbox
Feedback stuff
RAPTORIZED
fcking scrollbars
marron
few cosmetic changes
blah