Merge branch 'feature/OCSADV-170' of https://github.com/sraaphorst/ocs into sraaphorst-feature/OCSADV-170
Merge branch 'sraaphorst-feature/OCSADV-170' into release/ocs-2015A.1.1.1
Merge pull request #109 from sraaphorst/bugfix/REL-2100

REL-2100
Merge pull request #108 from sraaphorst/bugfix/REL-2113

REL-2113
OCSADV-191: cleanup
Merge branch 'feature/OCSADV-191-B' into release/ocs-2015A.1.1.1
REL-2121: NPE in TPE offset feature unload
Merge pull request #106 from swalker2m/feature/REL-2121

REL-2121: NPE in TPE offset feature unload
OCSADV-29: a bit of cleanup
OCSADV-29: combined AgsSeverity and AgsGuideQuality. simplified GuidingFeedback a bit
OCSADV-29: added feedback on selected target, as requested
Merge pull request #111 from swalker2m/bugfix/OCSADV-29

OCSADV-29: changes to guiding feedback
Revert "REL-1914: Added flip transformation to GMOS OIWFS when using AO." because of requirements change.

This reverts commit 453034f51a25a99378b45175d0fd005ec5b9eb60.
redoing REL-2099 due to git confusion
Merge pull request #114 from tpolecat/bugfix/REL-2099-redo

redoing REL-2099 due to git confusion
Merge pull request #115 from tpolecat/bugfix/REL-2105

REL-2105 keychain actions in QPT
REL-2097: updated GPI template to set aquisition observation class correctly
Merge pull request #116 from swalker2m/bugfix/REL-2097

REL-2097: GPI template XML update
REL-2127: grim target selection bug fix
Merge pull request #118 from swalker2m/bugfix/REL-2127-B

REL-2127: grim target selection bug fix