2013-11-05 test1
Merge remote-tracking branch 'origin/master'

Conflicts:
	index.php
2013-11-05 test1