files commited..

Signed-off-by: Manish Patil <manish.patil@runwalsoft.com>
Merge branch 'master' of http://runwalsoft/arca/repositories/arca

Conflicts:
	public/app/artistprofile/artistprofile.js
	public/app/obras/obras.js
artistas.js commited..

Signed-off-by: Manish Patil <manish.patil@runwalsoft.com>