Added stuff for android updates.
Merge branch 'master' of https://github.com/Jordi1990/Containing-2013

Conflicts:
	App/gen/com/example/containingapp/R.java