added default value for used in tickets
updated git ignore
wattball link is commented
seed merge problem gone
Merge branch 'develop'