correcting term search
merged new structure

Conflicts:
	app/js/controllers.js