20141028  insert

20141028  insert
Merge remote-tracking branch 'origin/master'

Conflicts:
	include/link.php
	index.php