quotas in project view finished
conficts resolved
change in jstack
Merged with master