Search engine working.
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/java/com/example/emersontenorio/fredschedulebuilder/DBAdapter.java
	app/src/main/java/com/example/emersontenorio/fredschedulebuilder/SearchActivity.java
	app/src/main/res/layout/activity_search.xml
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/java/com/example/emersontenorio/fredschedulebuilder/SearchActivity.java
	app/src/main/res/menu/options_menu.xml
Search Activity