files commited..

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

Conflicts:
	public/app/obras/obras.ejs

Signed-off-by: Manish Patil <manish.patil@runwalsoft.com>
masonry in single-artist page
collection theme page commited..

Signed-off-by: Manish Patil <manish.patil@runwalsoft.com>
Merge branch 'master' of http://runwalsoft/arca/repositories/arca
collection-page masonry
Merge branch 'master' of http://runwalsoft/arca/repositories/arca
css changes
obras pages commited..

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

Conflicts:
	exploreworks.php
	public/app/obras/obras.js
files commited..

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

Signed-off-by: Manish Patil <manish.patil@runwalsoft.com>
discount and obras related files commited..

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

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

Conflicts:
	public/app/app.js
js files commited..

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