In Work
First Merge
Second Merge
Third Merge

Hopefuly final
Forth Merge
Again painful conflicts....
Conflicts:
	AndroidManifest.xml
	gen/com/myapps/playnation/R.java
	src/com/myapps/playnation/Database/DataSource/Sub/WallsDataSource.java