added dynamic form
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/webapp/scripts/controllers.js
added dynamic form
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/com/cloudezz/houston/web/rest/AppImageCfgResource.java
	src/main/java/com/cloudezz/houston/web/rest/ImageInfoResource.java
	src/main/webapp/index.html
	src/main/webapp/scripts/controllers.js
	src/main/webapp/views/appimagecfgs.html
added dynamic form
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/com/cloudezz/houston/web/rest/ImageInfoResource.java
added dynamic form