Revised settings page
Moved accidental copy of app from / into /app/android/
merged juldev into dev