Slowly working away
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/java/com/jwilliams/machinistmate/app/ItemListActivity.java
Slowly working away