config.js merged
Merge branch 'master' of https://github.com/CagataySonmez/MobilHackathon2014