added migration files insert_add_default_user
Merge branch 'master' of https://github.com/rocho02/konferencia

Conflicts:
	protected/runtime/application.log
Merge branch 'master' of https://github.com/rocho02/konferencia