added bootstap modal
Merge branch 'development' of github.com:joshsoftware/kimayaTPN into development

Conflicts:
	config/database.yml
methods added to model user