Tasks 19.12.2014
Merge branch 'master' of https://github.com/castrowilde/fmiup