Added conditional states to the 'action button' associated with each calculation for a user
Merge branch 'dev' of https://github.com/grujic/tnt into dev

* 'dev' of https://github.com/grujic/tnt:
  put main.js in collected static on server
  Changed the Calculation model in the api app a little on the server - urgh going to get merge issues until I sort out how migrations work properly
  again this pesky repetition