Merging From kony-solutions fork

Working locally to build out, will merge changes as they are ready.