Merge pull request #2 from joemariedimzon/master

template adjustment
update programmeplanner to be closer to update specs (re: 370)
Preparing release 1.2
Back to development: 1.3
programme focus portlet template adjustment