tgl 19/09/2014 14.05
Merge branch 'master' of http://github.com/gaiius/ci