Merge pull request #560 from jonezy/master

production hotfix - March 14, 2014 11:35am
Merge pull request #568 from jonezy/master

moved most application shortcuts to iis
Merge remote-tracking branch 'upstream/development' into release-03182014
Merge branch 'development' into release-03182014
Merge branch 'development' into release-03182014
Merge pull request #577 from jonezy/release-03182014

Release 03182014
turned back on package merging.

Signed-off-by: Chris Jones <chris@jonezy.org>
added the ability to show grouped packages on staging only

Signed-off-by: Chris Jones <chris@jonezy.org>
Upadted F56 legal popup
Merge branch 'development' of github.com:jonezy/www.mini.ca into development
Merge pull request #578 from jonezy/development

Development