override default settings.php
Merge branch 'master' into AC-026/14
update core and all modules to most stable release
update ckeditor and date modules
attempt to merge not sure of issue
Merge branch 'AC-026/14'
merge branches