some wiring for the properties
Some side panel shit
Merge branch 'master' of https://github.com/Fathalian/nestor

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

Conflicts:
	app/views/main.html