moving stuff around
Merge branch 'backbone-setup' of https://github.com/pietdaniel/JAMR into backbone-setup
moved stuff around