werkende info

werkende info tab met alle? info
Merge branch 'master' of https://github.com/Saticmotion/PXLApp

Conflicts:
	gen/com/mobsoft/pxlapp/R.java
	res/values/strings.xml