* Add genome browser link to gridpanel
Merge branch 'chipSeqFlow' of http://frankfurt.aecom.yu.edu/git/wasp/rob into chipSeqFlow
added call to super in both macstwo tasks in beforeStep and afterStep
Merge branch 'develop' into chipSeqFlow

Conflicts:
	wasp-web/src/main/webapp/WEB-INF/jsp/jobresults/treeview.js.jsp
Merge branch 'develop' of http://frankfurt.aecom.yu.edu/git/wasp/blessedRepository into develop
fixed issue with url
Merge branch 'develop' of http://frankfurt.aecom.yu.edu/git/wasp/blessedRepository into develop
* Minor update for gridpanel and rowaction column
pulling in file type classes
updates to latest spring projects
Merge branch 'develop' of http://frankfurt.aecom.yu.edu/git/wasp/brent into develop
Merge branch 'develop' of http://frankfurt.aecom.yu.edu/git/wasp/rob into develop
Merge branch 'develop' of http://frankfurt.aecom.yu.edu/git/wasp/aj into develop
updated to get servlet name from request.getContextPath
fixed packaging promblems