Added the back keyword that will eventually replace the in keyword.

The logic between the two is the same.
Brings in the message panel changes.
Merge branch 'zhcard_dev' into andre_dev
Merge branch 'back_keyword' into andre_dev