changing the way the app is setup
changing load csrf token
fix loading csrf token
Merge remote-tracking branch 'upstream/master'
creating workaround for shapeshifter
admin extension check
upgraded emberjs
fixing tests
fixed model promise test
disable defer readiness in testing
just testing-- run PhantomJS on travis
upgrading and fixing tests
auth
Merge remote-tracking branch 'upstream/master'
package.json
merged
tests
fixing account security
control group
merging