basic email templating
add merge fields and send Template
fix filterByHiers when an $or options was passed
remove select2 code from app.css
add modified version of bootstrap3-wysihtml5
add bootstrap3-wysihtml5 as a local package
Merge branch 'devel' of javiber:Exartu/Exartu-CRM into devel

Conflicts:
	.meteor/packages
	server/methods/jobsMethods.js
filter by category in send template
Merge branch 'devel' of javiber:Exartu/Exartu-CRM into devel