hz
Merge branch 'master' of https://github.com/kai-net/dskexpert

Conflicts:
	application/modules/default/views/scripts/advice/index.html
	application/modules/default/views/scripts/faq/index.html
Merge branch 'master' of https://github.com/kai-net/dskexpert

Conflicts:
	application/modules/default/views/scripts/advice/index.html
	application/modules/default/views/scripts/faq/index.html
remove advice/index and faq/index