publiah post
publiah post
Merge remote-tracking branch 'origin/master'

Conflicts:
	application/controllers/Files.php
	application/controllers/user/posts.php
	application/controllers/user/profile.php
	application/models/class_post_model.php
	application/views/academy/classes/list.php
	application/views/files/upload_file.php
	application/views/user/post/list.php
	application/views/user/post/publish.php
publiah post