integration of login page
ignore nbproject and tmp
added fiels
solved merge conflict
sqllite
solved merge conflict
conflicts resolved