Changed pills list in add consumption to order by last consumed
Can now have black and white as colours for pills
Can now add pill colour when creating pill

Currently only on 'Your Medicine' fragment
Can add colours in add consumption page new pill
Merge branch 'master' into notifications

Conflicts:
	app/src/main/java/uk/co/pilllogger/activities/AddConsumptionActivity.java
Added the ability to set a reminder in X hours