#134
#135
#74
#136
#137
Merge branch 'master' of https://github.com/dimosarts/2014-autumn-informatics