dfg
Merge https://github.com/aaronmoralez/merkanuncioapp

Conflicts:
	www/drupalgap/drupalgap.js