Changes for final event demo PUMA March 2014
Merge branch 'master' of https://github.com/PUMA-IAM/puma-application