merging from hana
Merge pull request #21 from ercchy/master

Working on templates
Added login, no registration yet
Merge pull request #22 from sparkica/fea_registration

Added login, no registration yet