llklk
Merge branch 'master' of https://github.com/pussmun-12/mylife2

Conflicts:
	assets/www/js/DiaryMainController.js