resolved conflict

fixed missing semicolon

added check for field aliases property
Merge branch 'basic-field-alias-support' of github.com:brendancol/esri-leaflet into basic-field-alias-support