changeing propert
Linked 500 code with the error page
redirect to front end.
Fixed some css issues
intermediate bfr pull
Fixed css
Merge remote-tracking branch 'upstream/master'

Conflicts:
	JAPEBootstraps/src/main/java/SC_Decide_1.java
	OBIE/src/main/java/com/sigmacr/obie/OBIESystem.java
	SentimentAnalyzer/src/main/java/sigmacr/sentianalyzer/gate/GateAppCreator.java
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
alpha release snaphot 1.0
alpha release snaphot 1.0
Merge remote-tracking branch 'upstream/master'
adding method to close DB connections. changing css AmasonSerach.jsp
Merge remote-tracking branch 'upstream/master'
Fixed the resource links
merging with upstream