Making possible to use tokens on page and panel titles. Fixes #240.
Making possible to use tokens on page and panel titles. Fixes #240.

Conflicts:
	applications/default/public/js/controllers.js

TallerWebSolutions/choko,TallerWebSolutions/choko