Merge branch 'sbl-dev' of github.com:bnurbekov/wpi-suite into bnurbekov-sbl-dev
Merge branch 'sbl-dev' of git://github.com/struct-by-lightning/wpi-suite into sbl-dev
Merge branch 'sbl-dev' of git://github.com/struct-by-lightning/wpi-suite into sbl-dev
Hotfix for the estimate box

Fix for clearing the manual estimate box when switching to the different
requirement

Reported-by: bnurbekov, bkorza
Signed-off-by: Batyrlan Nurbekov <bnurbekov@wpi.edu>
Merge branch 'sbl-dev' of git://github.com/struct-by-lightning/wpi-suite into sbl-dev
Merge branch 'sbl-dev' of github.com:friscis/wpi-suite into sbl-dev
Merge branch 'sbl-dev' of github.com:struct-by-lightning/wpi-suite into sbl-dev
Merge branch 'sbl-dev' of github.com:struct-by-lightning/wpi-suite into sbl-dev
Merge branch 'sbl-dev' of github.com:struct-by-lightning/wpi-suite into sbl-dev
Merge branch 'sbl-dev' of github.com:bnurbekov/wpi-suite into sbl-dev

Conflicts:
	PlanningPoker/src/edu/wpi/cs/wpisuitetng/modules/PlanningPoker/views/OpenGameView.java
Merge branch 'bnurbekov-sbl-dev' into sbl-dev