Added and fixed some issues in app.

Also updated controller and simulator (protocol).
Merge branch 'master' of https://github.com/Jordi1990/Containing-2013