fixes #2838 Saving twice in the language manager throws javascript error
fixes #2051 Editing an Event from a page throws Null Pointer Exception
Merge pull request #2939 from dotCMS/issue-2838-Saving-twice-in-the-language-manager-throws-javascript-error

fixes #2838 Saving twice in the language manager throws javascript error
patch
Merge branch 'master' of https://github.com/dotCMS/dotCMS into issue-2910-restful-save-pending
#2836
Merge pull request #2943 from dotCMS/issue-2836-language-property-value-with-equals-sign

#2836
Merge pull request #2941 from dotCMS/issue-2051-Editing-an-Event-from-a-page-throws-Null-Pointer

fixes #2051 Editing an Event from a page throws Null Pointer Exception
implements #2888  - simple/advanced searches
stylized and formated the advanced slidedown #2888
' search by defualt

Conflicts:
	src/com/dotmarketing/portlets/contentlet/ajax/ContentletAjax.java
Conflicts:
	src/com/dotmarketing/portlets/contentlet/ajax/ContentletAjax.java
Conflicts:
	src/com/dotmarketing/portlets/contentlet/ajax/ContentletAjax.java
#2858
Merge pull request #2951 from dotCMS/issue-2858-Publishing-in-the-future-with-no-expire-date-fails-validation

#2858
#2910 working to get uri file and images
Merge branch 'master' of https://github.com/dotCMS/dotCMS into issue-2910-restful-save-pending