Getting update from PP

2014-08-01
Merge branch 'master' of https://github.com/lumened/website

Conflicts:
	Old_Site/img/logo.png
Merge branch 'master' of https://github.com/lumened/website