added beer
removed router and added iron router
Merge branch 'design' into prototype

Conflicts:
	meteorGame/.meteor/packages
	meteorGame/client/main.html
	meteorGame/client/router.js
	meteorGame/smart.json
	meteorGame/smart.lock
Merge branch 'prototype' of https://github.com/LivioTeam/OpenCommonsGame into prototype