Merge branch 'master' of https://github.com/jdsantiagojr/angular-fnd

Conflicts:
	src/datepicker/datepicker.js
	template/datepicker/datepicker.html