Merge branch 'src' of https://github.com/populr/populr.github.com into src

Conflicts:
theming/index.html
Merge branch 'src' of https://github.com/populr/populr.github.com into src

Conflicts:
	theming/index.html