23-07-2014
Merge branch 'julyb' of https://github.com/pamael/apps into julyb