Merge branch 'meg_angular'

resolved merge conflcit
seed file
resolve conflict
add seed file and images
angular setup in index