Merge branch 'master' into senhong

Conflicts:
	files/html/help.html
	protected/controllers/DatasetController.php
	protected/controllers/RssController.php
	protected/controllers/SearchController.php
	protected/models/Author.php
	protected/models/Dataset.php
	protected/models/DatasetAuthor.php
	protected/models/DatasetProject.php
	protected/models/File.php
	protected/models/FileFormat.php
	protected/models/FileType.php
	protected/models/Link.php
	protected/models/Manuscript.php
	protected/models/News.php
	protected/models/Project.php
	protected/models/Publisher.php
	protected/models/RssMessage.php
	protected/models/Species.php
	protected/models/Type.php
	protected/models/User.php
	protected/views/search/index.php