proof of concept of integration test
Linux needs libffi-dev to install the cffi package
headless test with phantomjs
kill jasmine-jquery; make the old jasmine tests run (and fail...)
Minor doc update
Merge tag 'prodenvs_to_master' into develop

Ready for prod

Conflicts:
	fabfile.py
Merge tag 'fix_js_error_in_msg_2014-07-11' into develop

Ready for prod
add marionette to bower
css for jasmine
run jasmine as part of testsuite

Conflicts:
	assembl/static/js/main.js
botched commit
Merge tag 'migration_ate_threading' into develop

Ready for prod
restore parents lost in reparenting bug
revert to firefox. tests fail on phantomjs 1.9.0 on ubuntu
assembl : add module marionette
Clarify an obscure function call
run browser tests after server tests
assembl : refactoring app to marionette
first pass at redesigning Login form
add some help about translation