Merging origin.
Fixed routes, now everything in the iFrames should be a valid route in the Ember.js app.
Fixed jshint warning thrown on grunt jshint.
Cleanup of routes.
Settings loads index, and also now loading a marketplace loads settings by default.
Added templates/logs and updates .gitignore.
tweak
Merge commit 'e33d62a519bbbe6d9361b1ce530a7d4a831aec65'
Merge branch 'master' into search