4/5/2014 - EOD commit
Merge branch 'master' of https://github.com/idea-vine/backend.git

Conflicts:
	BI_service_web/src/main/resources/spring/application-hibernate-config.xml