Fixed namespace bug
Updated distribution
Merge branch 'develop'
Merge branch 'master' of github.com:marteinn/Android-Config