Updated git ignored with Netbeans project folder
Removed app from menu
Drupal auth added
Resolved merged conflict in deleted heeader.html