Merge origin/master

Conflicts:
	.gitignore
Merge origin/master

Conflicts:
	.gitignore
Merge origin/master

Conflicts:
	.gitignore
Merge origin/master

Conflicts:
	application/views/pagestub.php
	application/views/workspace/tab_analysis.php
	lib/js/angular/ws/SettingsController.js