Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge commit '04fbc989c7f03423925b9cefc72e042f926169e9'
Merge branch 'develop'
Updates
Merge branch 'develop'

Conflicts:
	login.php
	templates/user/login.tpl
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
Merge branch 'master' into develop