Merge branch 'master' into 909-authmerge

Conflicts:
	src/main/java/edu/harvard/iq/dataverse/DatasetPage.java
	src/main/java/edu/harvard/iq/dataverse/DatasetServiceBean.java
	src/main/java/edu/harvard/iq/dataverse/DataversePage.java
	src/main/java/edu/harvard/iq/dataverse/engine/command/impl/DeleteDataFileCommand.java
	src/main/webapp/dataset.xhtml
	src/main/webapp/dataverse_template.xhtml
	src/main/webapp/loginpage.xhtml
Fixed(?).
updated for auth merge
added isBuiltInUser and canResetPassword methods
updated for auth merge
updated for auth merge
changed dv to authenticated user
updated for auth merge
Merge origin/909-authmerge into 909-authmerge
changed the getUser() framework in the DatasetPage.
updated for auth merge
updated for auth merge
ManageTemplates Page
password resets are for builtin users
User also has isBuiltInUser and canResetPassword
added method setBuiltInUserStatus
Fix Version user for update dataset
implementation of builtin user check
comment out setBuiltInProviderFlag
get password reset working again #909