Remove most 1%Club related JS
Merge pull request #13 from gannetson/remove-onepercent-js

Remove most 1%Club related JS
Extra ember library, verified tests

Conflicts:
	static/global/js/vendor/ember-data-drf2-adapter.js
Fixed an issue causing BlueBottleTestSuite to be imported in regular non-core bb projects, causing ImportError on setuptest

Conflicts:
	bluebottle/tests/__init__.py
	setup.py
Added a serializer capable of providing metadata to Ember
Merge pull request #14 from gannetson/maykinmedia-meta-seo-2

Maykinmedia meta seo 2
Extra ember library, verified tests

Conflicts:
	static/global/js/vendor/ember-data-drf2-adapter.js
Added block meta in bluebottle base template
Modified to play nice with onepercentclub-site again
Merge pull request #15 from gannetson/maykinmedia-meta-seo-2

Maykinmedia meta seo 2
Add ember-meta
Merge pull request #16 from gannetson/fix-meta

Add ember-meta
Some javascript files could not be loaded because they were in the wrong directory
Fixed static files so BlueBottle tests pass, renamed testdata database from VC
Router map was included in routes.js already
updated travis config
resolve conflicts
Merge branch 'master' of github.com:maykinmedia/bluebottle into meta-seo-2
Refactoring meta data, TODO: check app.js and ember-meta.js, make sure they function for tests