Web version 1.0 and Android version 1.1

Sync on Android
Final version for web version