Maybe it will not work, maybe it will
Merge branch 'master' of https://github.com/SWTI2014/SWTI2014-Project-15

Conflicts:
	packages/NeuDeli-Interaction-Core.package/monticello.meta/version