BZ-13213 Updated tooltip handling
BZ-13133:As a projects user I would like the ability to change the term length on the competitive estimates
BZ-13133:As a projects user I would like the ability to change the term length on the competitive estimates
Merge branch 'RC20140807' into integration

Conflicts:
	.idea/workspace.xml