2014/10/28 made a box lsit
Merge branch 'Operation' of github.com:AmusementBoxCreateTeam/AmusementBox into Operation

Conflicts:
	application/views/user/index.php