Bootstrap changes
Merge branch 'master' of git://github.com/infinity-se/infinity-user

Conflicts:
	view/zfc-user/user/login.phtml
	view/zfc-user/user/register.phtml