bug fix
Merge branch 'master' of https://github.com/pista329/django-oneskyapp