bo
Merge branch 'master' of https://github.com/danturi/PolisocialApp.git

Conflicts:
	Polisocial/Polisocial/.classpath
lib
aggiustato appengine
login/reg
fix login and registration
def fix login and registration