Merge branch 'develop' into chipSeqFlow

Conflicts:
	wasp-core/src/main/java/edu/yu/einstein/wasp/service/impl/JobServiceImpl.java
Merge remote-tracking branch 'Rob/chipSeqFlow' into chipSeqFlow

Conflicts:
	wasp-core/src/main/java/edu/yu/einstein/wasp/service/impl/JobServiceImpl.java
Merge branch 'develop' of http://frankfurt.aecom.yu.edu/git/wasp/blessedRepository into develop
* Fixed extjs panel max/collapse button issue
Merge branch 'develop' into chipSeqFlow
Merge bug fix to Rob's chipseqflow branch
was able to display iframe in panel
start getAllFilesDisplayedBySamplePanelTab
completed filesBySample and filesByType using multiple panels in each of these two tabs.
added groupedGrid by filetype
minor fix
minor
added override to interface class
minor
added modelpng to macs2 filetypelist
completed generation of png from pdf
Merge branch 'develop' into chipSeqFlow
added two additional macs2 filetypes, specifically for braod peaks
Merge branch 'develop' of http://frankfurt.aecom.yu.edu/git/wasp/blessedRepository into develop
* Implement a new type of panel: Grid panel
* Change the file download panel to use the new panel type
* To-do: convert job related panels into new panel type