Team meeting commit 15/5/14

Completed main scaffolding (except ticketing system)