change_premium
Merge remote-tracking branch 'origin/development' into development

Conflicts:
	index.php
Merge remote-tracking branch 'origin/development' into development