Added properties/tasks to the panel
Merge branch 'master' of https://github.com/Fathalian/nestor

# By Zaryafaraj
# Via Zaryafaraj
* 'master' of https://github.com/Fathalian/nestor:
  style changes to side bar

Conflicts:
	app/views/main.html
Merge branch 'master' of https://github.com/Fathalian/nestor

# By Zaryafaraj
# Via Zaryafaraj
* 'master' of https://github.com/Fathalian/nestor:
  more changes