merging into master
Merge branch 'master' of https://github.com/kereru-2014/MobileLibraryWeb
merging with master