something sane for the container boxes
Merge branch 'master' of https://github.com/Fathalian/nestor

# By Farzad (2) and Zaryafaraj (2)
# Via Farzad (2) and Zaryafaraj (2)
* 'master' of https://github.com/Fathalian/nestor:
  watching changes to the "template" so we can update "stringTemplate" (i.e. the UI representation of the Cloud Formation Template)
  style changes properties
  - a few JSHint bug fixed - drag properties now work (again , cause my change last night kinda broke them. But as a bonus, now we have a much simpler model and we don't need to pass around so many long parameters to our directives because "template" object is offered through a service )
  no message

Conflicts:
	app/scripts/directives/blockDisplayDirectives.js