fixed merge problems
Merge branch 'master' of https://github.com/averageazn247/sample_app