update
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/java/inxs/nu/projects/ProjectActivity.java
db-klar