no message
Merge branch 'master' of https://github.com/mich94git/lpdw

Conflicts:
	application/compiled/2580bc0ebace6219acfe8e8736a36dd251a329fa.file.index.tpl.cache.php
	application/compiled/495fc432b3fd34d1f582d189e758c35b360a4790.file.header.tpl.cache.php
	application/compiled/5c11153309b6736c27efcf03d7ad0889f3e5fe94.file.login.tpl.cache.php
	application/compiled/b533d1edca42649560846b9ebc978c0398de6ee9.file.footer.tpl.cache.php
	application/libraries/smarty/cache/495fc432b3fd34d1f582d189e758c35b360a4790.header.tpl.php
	application/libraries/smarty/cache/5c11153309b6736c27efcf03d7ad0889f3e5fe94.login.tpl.php
	application/libraries/smarty/cache/b533d1edca42649560846b9ebc978c0398de6ee9.footer.tpl.php
	application/libraries/smarty/cache/cd9bb17e657315c7bb74e78b452dcd1cfc1fc091.index.tpl.php