Merge pull request #292 from funkedgeek/master

File and Image advanced now use Underscore.js
Merge pull request #297 from funkedgeek/master

Image advanced fixes, update to validation
Update kaiser's profile
Merge remote-tracking branch 'upstream/master'
Fixed issue with color field disappearing