adding changes that currently dont work - only for reference
adding changes to projects api root
Merge branch 'master' into changing_a_lot

* master:
  changing default encryption token