Added Address tag
fixed index.php conflict
Merge branch 'test'
Fixed index.php conflict

someone missed a semicolon on the php statement on line 10