Fixed conflict bug with angular-u
Fixed bug conflict with angular-ui
Merge branch 'master' of https://github.com/samuelcastro/angular-flexslider