alan[
Merge branch 'master' of https://github.com/jferluna/Android-Project-Manager
Merge master branch and pepain branch