Merge branch 'master' of https://github.com/Derinruban/TABR-JQM

Conflicts:
.DS_Store
App/.DS_Store
update 2