Merge pull request #297 from Cipa/develop

hide permission tab when empty
Change noconflict setting to true.
New sample site, old demo removed
Change gitignore to show assets/images
Add images for demo
Change $ to jQuery to work in noConflict mode
Remove surplus files from template folder
Remove unneccessary code
Merge pull request #299 from kp52/sample-site

Sample site for 1.2
Clear cache on manager login/logout for QM+ JS/CSS
Correct favicon.png for demo, link to documentation
Merge pull request #302 from kp52/develop

Correct demo favicon.png, documentation link