News List& News Page add
Merge branch 'master' of https://github.com/ca-miro/AppBuilder-Template.git

Conflicts:
	Template/index.html