prop modder

PS2: Add missing java and xmls
PS3: Rebase
PS5: Fixed a missing string
PS6: Whitespace fix
PS7: More whitespace fixes
PS10: Add moar files
PS13: Fix conflicts
PS14: Fix the build and remove unused files

Change-Id: I711d67a7b2f2bfda1e375d61ffd16b0b3d04e8d3