minor changes
Merge branch 'master' of github.com:jjlee5266/Where-Fi

Conflicts:
	where-fi_app/lib/tasks/admin.rake