added boostrap fix
added charset utf8 to connection
fixed $_GET["message"] in sms receiver
added city
added state
added order id to on success order
fixed clicky report in index page
added article
added icon to text element
Text changed to TextElement
added jalali
fixed text element value
fixed CSS icon files
fixed font folder
Merge origin/master into amlak

Conflicts:
	apps/admin/models/City.php
	apps/admin/models/State.php
	nbproject/project.xml
fixed order