Scanner implemented.
Merge remote-tracking branch 'origin/master'

Conflicts:
	Printmanager/app/src/main/java/smpt42/nl/printmanager/control/Database.java
	Printmanager/app/src/main/java/smpt42/nl/printmanager/view/MainActivity.java
Scanner implemented.