нормальный темплейтер
нормальный темплейтер
договор
Merge remote-tracking branch 'origin/master'

Conflicts:
	www/application/classes/Controller/WordTemplate.php
	www/application/logs/2013/09/04.php
	www/application/logs/2013/09/05.php
	www/application/output_blanks/zayavleniya/zayavlenie_05_09_2013_22_02_08.docx
	www/application/output_blanks/zayavleniya/zayavlenie_05_09_2013_22_04_40.docx
	www/application/output_blanks/zayavleniya/zayavlenie_05_09_2013_22_06_09.docx
договор