D-17

v-1.0
---
1. authenticate

	==> done
Merge branch 'D-17_authenticate'

Conflicts:
	app/tmp/cache/models/myapp_cake_model_default_development_sqlite3_list
	app/tmp/cache/models/myapp_cake_model_default_langs
	app/tmp/cache/models/myapp_cake_model_default_texts
	app/tmp/cache/persistent/myapp_cake_core_cake_dev_en-us
	app/tmp/cache/persistent/myapp_cake_core_cake_en-us
	app/tmp/cache/persistent/myapp_cake_core_file_map
	app/tmp/cache/persistent/myapp_cake_core_method_cache

 Changes to be committed:
	modified:   app/tmp/cache/models/myapp_cake_model_default_development_sqlite3_list
	modified:   app/tmp/cache/models/myapp_cake_model_default_langs
	modified:   app/tmp/cache/models/myapp_cake_model_default_texts
	modified:   app/tmp/cache/persistent/myapp_cake_core_cake_dev_en-us
	modified:   app/tmp/cache/persistent/myapp_cake_core_cake_en-us
	modified:   app/tmp/cache/persistent/myapp_cake_core_file_map
	modified:   app/tmp/cache/persistent/myapp_cake_core_method_cache
D-18

v-1.0
---
1. texts

    ==> done
D-18

v-1.1
---
1. words

    ==> done