Inlcude black gate and move forms to forms folder
Merge remote-tracking branch 'origin/master' into Develop-1.0