other
Merge branch 'master' of github.com:taufiksu/melisa
news
yea
yea

Merge branch 'master' of github.com:taufiksu/melisa into sakola

Conflicts:
	application/modules/home/views/index.php
	application/modules/news/views/list_news_home.php