Added timer.
Merge branch 'master' of https://github.com/Jordi1990/Containing-2013
Fixed invalid types on Android app crane tab and clean up code.
Merge branch 'master' of https://github.com/Jordi1990/Containing-2013