Merge remote-tracking branch 'upstream/master' into CRAFTERCMS-167
Merge remote-tracking branch 'upstream/master' into CRAFTERCMS-175
CRAFTERCMS-175
Fixed deployment bug for java 1.7
CRAFTERCMS-169
Request to unlock item was sent on cancel action even in case of new content form (content item does not exist).
CRAFTERCMS-156: lastModifiedDate created in XML is off by 12 hours

Simplify date conversion method to UTC
CRAFTERCMS-180
Fixed bug that was causing empty path to be sent when requesting copy on empty and non-index folders (like /site/components)
CRAFTERCMS-164;CRAFTERCMS-165;
Update corporale blueprint:
- Removed inert "touts" field from form (also template and content)
- Jquery library is now loaded from static assets (not from remote url)
Merge pull request #49 from quiaro/master

Bug Fix
CRAFTERCMS-137
Regular expression for appending multivalued sufix fixed.
CRAFTERCMS-184: Enable moving and creation of components from the ICE toolbar

- Remove dependendency on method from common-api (causes race condition)
- Improve styles for new components
- Fix FF bug related to getComputedStyle
CRAFTERCMS-184: Fix the inheritance of styles when moving components

Fix the inheritance of styles when the drop zones are enabled.
Merge remote-tracking branch 'david/master'
CRAFTERCMS-179: 'Change Template' should not be available on empty folders

The 'Change Template' option in the context menu (in the site dropdown)
should not show up if folders are empty in the Components and Pages
sections.
CRAFTERCMS-179: 'Change Template' should not be available to folders
CRAFTERCMS-198
Publishing was failing due to bug (content reader was requested for folder).
CRAFTERCMS-202: Multiple forms open for the same content

While a form is open, clicking to edit the same content must not open
another form (window) -even if the form is reloaded.
CRAFTERCMS-202: Multiple forms open for the same content

While a form is open, clicking to edit the same content must not open
another form (window) -even if the form is reloaded.
Merge remote-tracking branch 'david/master'
CRAFTERCMS-210: Each RTE makes a call to /site/sitename

If there are no configured stylesheets, each RTE makes a call to
/site/sitename which results in a 500.
Merge branch 'master' of https://github.com/quiaro/studio