Trying to fix our issues

There's some issues with the reference IDs on a couple of Sybil's
screens (which is why they're all overlapped) and the java for Moses'
map screen is not being cooperative. If we fix those issues I think
we'll be set, though. Possibly they're things that can be fixed by
digging through older commits to find what the right relative format ids
were and such.

This is such a headache.
A few more changes

Readded the Changepassword screen in.
Working app .xml .java

As of 10/16/2014, the app that is compiling and working.
Merge branch 'master' into Experimental-Branch-to-Fix-Merges