keyerror_fix
Merge branch 'master' of https://github.com/ChillOutHack/chillout_app