Working on tags
Merge branch 'develop' of https://github.com/jcare44/TodoAndroid into develop

Conflicts:
	app/src/main/java/com/todorfvj/app/EditActivity.java
	app/src/main/java/com/todorfvj/model/Todo.java
Adding tags