Merge branch 'master' of https://github.com/sivaiex/venus.git

Conflicts:
	src/main/java/com/iexsoft/home/HomePage.html
	src/main/java/com/iexsoft/home/HomePage.java
Merge branch 'master' of https://github.com/sivaiex/venus.git