Beta Base Project
Merge branch 'master' of https://github.com/isdarka/BaseProject