commit by liu.wenju 20130408
Merge branch 'master' of https://github.com/ausdauernd/nnkzdb

Conflicts:
	nnkzdb/app/controllers/progs_controller.php
	nnkzdb/app/models/noteinfo.php
	nnkzdb/app/models/noteinfotag.php
commit by liu.wenju for 20130408