Merge branch 'Dev'

Conflicts:
	DB/php-activerecord