nothing update -----fucking post
Revert "nothing update -----fucking post"

This reverts commit 60c285cf41b2fdf50f716cf73c6d5fb9d08f2e8c.
Merge remote-tracking branch 'origin/P_P'

Conflicts:
	app/database/migrations/2014_02_21_131118_product.php
Merge branch 'master' of https://github.com/iboss-ptk/cba_line5_site

Conflicts:
	app/database/migrations/2014_02_10_080351_confide_setup_users_table.php
	app/database/migrations/2014_02_21_131118_product.php
	app/routes.php