server side template changes
Merge branch 'master' of github.com:jopepope/portfolio2014
staging db