13-12-2013
Merge branch '11-12-2013' of http://github.com/archnoth/android into 11-12-2013

merge
14-12-2013