23-12-13
Merge branch 'master' of http://github.com/archnoth/android

merge