events
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/java/inxs/nu/happyapp/modules/projects/NewProjectActivity.java
Merge remote-tracking branch 'origin/master'
events