removed unneeded .gitmodules
Merge branch 'bower' into swing-interface