Update
Merge remote-tracking branch 'origin/master'

Conflicts:
	AndroidManifest.xml
	res/layout/activity_home.xml
	res/menu/home_actions.xml
	src/main/java/com/example/wfl/activity/HomeActivity.java