editname
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/controllers/ProfileController.php
	app/database/migrations/2014_10_21_090606_create_user.php
	app/routes.php
	app/views/profile/like.blade.php
	app/views/profile/user.blade.php
	app/views/showprofile.blade.php