bower compatibility
Merge branch 'gkovacs-master'