login ajax
Merge branch 'master' of https://github.com/exprezzo/coral_erp

Conflicts:
	constructor