Small Fixes
Merge branch 'master' of https://github.com/navrav/RedWedding

Conflicts:
	index.php