temp commit to pull person.html
Merge branch 'master' of https://github.com/davidich/elixir

Conflicts:
	APPLICATION/Html/person.html
	APPLICATION/Scripts/Vms/artistDetails.js
	APPLICATION/elixirDev.html
UserDetails page is done