CRAFTERCMS-189
Fixed bug that was causing incorrect deployer version.
CRAFTERCMS-223: <br> and <hr> auto correction in RTE
CRAFTERCMS-228: Apostrophe is sometimes changed to &#39;
CRAFTERCMS-224
Added site-id parameter to endpoint configuration. This parameter overrides site name which is sent as default siteId to deployment agent.
CRAFTERCMS-15: The contextual nav doesn't expand when the browser window expands in Chrome
CRAFTERCMS-166: Cookie name conflict in RTEs in different forms

Height value stored in cookie for an RTE can affect another RTE in a
different form. Issue resolved by apending the window name of the form
being edited to the cookie id, thus we're targeting RTEs within their
specific context.
CRAFTERCMS-43: Smart table name breaks in two lines with a whitespace
Merge remote-tracking branch 'david/master'