add edit text hint
Change main activity to tab layout
Merge branch 'camera' into new_master
Merge branch 'camera' into new_master
initial commit to change to tagview
add v4 support android library
restore working commit
tag view working, awesome icons
Merge branch 'tag_view' into new_master

Conflicts:
	app/src/main/java/cs121/team5/com/licenseplate/MainActivity.java
	app/src/main/res/layout/activity_main.xml
Merge branch 'new_master' into camera