Merge branch 'master' of https://github.com/ddvj79/office-name-plate

Conflicts:
	.idea/gradle.xml
	.idea/vcs.xml
	app/src/main/java/hackfest/office_name_plate/MainActivity.java