Merge branch 'master' of https://bitbucket.org/raphaellab/magi into updateUplaod
Add annotation subtype support
Fix merge conflict
Merged updateUplaod into master
Add preliminary heatmap rendering support
Get prototype heatmap working
fix issue assembling heatmap data. it was transposed and squared in size.
ignore datasets with no data matrix information when viewing data matrices from multiple datasets.
Add changes to model/datasets for heatmap
Polish heatmap support
handle case to merge multiple data matrices
clean up validation of dataset upload
add support for sample annotation matrix
Finish heatmap download
Merge branch 'connectFront' of https://bitbucket.org/raphaellab/magi into connectFront
add ability to upload mapping of annotations to colors

fix view to only show heatmap if there is heatmap data
give users ability to upload color mapping file
Add sample annotation row label support
Merged in connectFront (pull request #11)

Add sample annotation and heatmap support for MAGI
Merged in uploadSampleAnnotations (pull request #10)