risolti bug minori
risoluzione conflitti
Merge branch 'master' of https://github.com/ferpic87/nexu
Merge branch 'master' of https://github.com/ferpic87/nexu
Merge branch 'master' of https://github.com/ferpic87/nexu
Merge branch 'master' of https://github.com/ferpic87/nexu
enginestart
Merge branch 'master' of https://github.com/ferpic87/nexu
Merge branch 'master' of https://github.com/ferpic87/nexu
Merge branch 'master' of https://github.com/ferpic87/nexu
Merge branch 'master' of https://github.com/ferpic87/nexu
Merge branch 'master' of https://github.com/ferpic87/nexu

Conflicts:
	engine/start.php
Merge branch 'master' of https://github.com/ferpic87/nexu

Conflicts:
	engine/start.php
Merge branch 'master' of https://github.com/ferpic87/nexu
Merge branch 'master' of https://github.com/ferpic87/nexu
aggiunta freichat
Merge branch 'master' of https://github.com/ferpic87/nexu
Merge branch 'master' of https://github.com/ferpic87/nexu
Merge branch 'master' of https://github.com/ferpic87/nexu