oman
Merge branch 'master' of github.com:junald/mantawi

Conflicts:
	src/main/webapp/WEB-INF/views/news-edit.html