second commit
Merge https://github.com/toussii/android

Test files