Changelog 7 13/05/14
- Changed variable names in controller and view