1
1
1
Merge branch 'develop'

Conflicts:
	admin/resources/admin/account.html
	admin/resources/admin/charts.html
	admin/resources/admin/faq.html
	admin/resources/admin/grid.html
	admin/resources/admin/index.html
	admin/resources/admin/plans.html