Changed location of chosen.css
Merged changes from development
Merge branch 'staging'