pending
Merge branch 'master' into feature/ang

Conflicts:
	Gemfile.lock
fixing search and migration
Merge branch 'feature/ang' into develop