Merge branch 'release-1.1' into develop
Merge branch 'master' into develop
Merge pull request #30 from SyntaxError2014/nbi

Nbi
Merge branch 'master' into develop
Various bug fixes
Bugfixes & User profile