Merge branch 'feature/iss5' into develop
Resolution of issue #7 admin functional, must improve.
Merge branch 'develop' of github.com:bittion/admin into develop
Resolution of issue #7 admin functional, must improve. MERGING iss7 con iss3 CONFLICT WARNING.