Added scanning functionality
Merge remote-tracking branch 'origin/master'

Conflicts:
	projectskullnbones/src/main/java/com/theexceptionulls/projectskullnbones/homescreen/CardsGridActivity.java