Merge branch 'master' of https://github.com/infloop/transys

Conflicts:
	orm/model/index.js
	orm/orm.js
	orm/repository/abstractRepository.js
	public/javascripts/app/collection/collectionAbstract.js
	public/javascripts/app/view/job/jobView.js