changed issues txt
fixed merge conflict

Merge branch 'master' of https://github.com/thebuoyant/app

Conflicts:
	repositoy/app/src/main/webapp/doc/issues.txt