Fix bootstrap/jquery button incompatibility
Merge branch 'master' of git://github.com/guru-digital/frontend-admin