update ignore
remove netbean project setting

Signed-off-by: Thuy Dinh Xuan <thuydx@zendgroup.vn>
Merge remote-tracking branch 'upstream/master'
Update multiple navigation menu
Update multiple layout and block view

Signed-off-by: Thuy Dinh Xuan <thuydx@zendgroup.vn>
Merge pull request #12 from thuydx/master

confirmed