small update on Programmas view
Merge origin/master

Conflicts:
	public/index.php