corrected appid
bugfixes
fixed mergeconflict
added jsonindent
added jsonindent