Merge with development
Merge branch 'development' into all_adverts_branch
Fix signup spec
Fix dashboard_controller_spec
Fix dashboards_controller#index spec