Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/java/kj125/wwabiszczewicz/parentscontrol/AccessActivity.java
Merge remote-tracking branch 'origin/master'