search page styling
added heirarchy-based result info
working on sort search
working on search bar and sort
modified search and filter bars design
added hoveron functionality
working on hoveron
adding dynamic rating
made filter and sort by
no message
working on results found row
added search page functionality
added remarks to scss file
Merge branch 'doron-search' of https://github.com/ywarezk/nerdeez-client into doron-search

Conflicts:
	nerdeez_client_app/static/app/bower_components/compiled_app/styles/style.css
Merge branch 'doron-search'

Conflicts:
	nerdeez_client_app/static/app/bower_components/compiled_app/scripts/combined-scripts.js
	nerdeez_client_app/static/app/bower_components/compiled_app/styles/style.css
	nerdeez_client_app/static/app/scripts/models/schoolgroup-model.js
fixed bug in user profile model
Merge branch 'files-page'
finished with creating the new hw
trying to integrate doron star grade
Merge branch 'master' into files-page

Conflicts:
	nerdeez_client_app/static/app/bower_components/compiled_app/scripts/combined-scripts.js
	nerdeez_client_app/static/app/scripts/models/schoolgroup-model.js