photos photos_date varchar
friends subscribe_date varchar
Merge branch 'origin/master2'

Conflicts:
	application/models/db_module.php