Avoiding space in categories + making the set of categories more stringent. Closes #1287
Merge branch 'master' of github.com:jamoma/JamomaWebSite