soln to .htaccess
Merge branch 'develop'
Merge branch 'develop'
fix bower path