Syn with LinkedIn
Merging..
Merge branch 'master' into cash-dev-branch

Conflicts:
	application/views/login_index.php