WIP
blub
Merge branch 'master' of github.com:SolidNerd/Links2Android_Client