Add netbeans project files
Make views static
Conflicts resloved.
Diaplayed the username with facebook login on home page.