Merge branch 'master' of https://github.com/mister7/assos.git
Merge branch 'master' of https://github.com/mister7/assos.git