Merge remote-tracking branch 'origin/master' into liveBranch
PHP5.4x is required for the debugkit I have....so disabled it temporarily
Merge branch 'dftaiwo' into liveBranch
Merge branch 'liveBranch'
changed full_name field to name in models and views
Merge branch 'dftaiwo' into liveBranch
Merge branch 'liveBranch'