.
Merge branch 'master' of https://github.com/garagepoort/Android

Conflicts:
	AlarmAndroidClient/.classpath
	AlarmAndroidClient/gen/.gitignore
	Memento/.classpath
	Memento/assets/exceptions.properties
	Memento/libs/memento-entities.jar
	Memento/src/be/cegeka/memento/domain/utilities/ContactsPersistence.java
	Memento/src/be/cegeka/memento/presenter/Presenter.java
	Memento/src/be/cegeka/memento/view/ContactsListActivity.java
	Memento/src/be/cegeka/memento/view/MainActivity.java
	Memento/src/be/cegeka/memento/view/TagsListActivity.java